Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 7 Jun 2010 23:06:49 +0000 (23:06 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 7 Jun 2010 23:06:49 +0000 (23:06 +0000)

Trivial merge